6:32 p.m.
Branch: refs/heads/master
Home: https://github.com/Teiid-Designer/teiid-designer
Commit: 77ad44190ee3063c922350bbecdd0ba5132ab26c
https://github.com/Teiid-Designer/teiid-designer/commit/77ad44190ee3063c9...
Author: blafond <blafond(a)redhat.com>
Date: 2016-11-22 (Tue, 22 Nov 2016)
Changed paths:
M features/org.teiid.designer.feature/feature.xml
M plugins/org.teiid.designer.modelgenerator.salesforce/META-INF/MANIFEST.MF
Log Message:
-----------
# WARNING: head commit changed in the meantime
Merge remote-tracking branch 'origin/10.0.x'
Conflicts:
documentation/guides/Teiid_Designer_User_Guide/en-US/master.xml
documentation/guides/Teiid_Designer_User_Guide/pom.xml
features/org.teiid.datatools.connectivity.feature/feature.xml
features/org.teiid.datatools.connectivity.feature/pom.xml
features/org.teiid.designer.feature/feature.xml
features/org.teiid.designer.feature/pom.xml
features/org.teiid.designer.library.feature/feature.xml
features/org.teiid.designer.library.feature/pom.xml
features/org.teiid.designer.runtime.feature/feature.xml
features/org.teiid.designer.runtime.feature/pom.xml
features/org.teiid.designer.teiid.client.feature/feature.xml
features/org.teiid.designer.teiid.client.feature/pom.xml
features/org.teiid.designer.test.feature/feature.xml
features/org.teiid.designer.test.feature/pom.xml
plugins/org.teiid.core.designer/META-INF/MANIFEST.MF
plugins/org.teiid.core.designer/pom.xml
plugins/org.teiid.datatools.connectivity.model/META-INF/MANIFEST.MF
plugins/org.teiid.datatools.connectivity.model/pom.xml
plugins/org.teiid.datatools.connectivity.ui.flatfile/META-INF/MANIFEST.MF
plugins/org.teiid.datatools.connectivity.ui.flatfile/pom.xml
plugins/org.teiid.datatools.connectivity.ui/META-INF/MANIFEST.MF
plugins/org.teiid.datatools.connectivity.ui/pom.xml
plugins/org.teiid.datatools.connectivity/META-INF/MANIFEST.MF
plugins/org.teiid.datatools.connectivity/pom.xml
plugins/org.teiid.designer.advisor.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.advisor.ui/pom.xml
plugins/org.teiid.designer.compare.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.compare.ui/pom.xml
plugins/org.teiid.designer.compare/META-INF/MANIFEST.MF
plugins/org.teiid.designer.compare/pom.xml
plugins/org.teiid.designer.core.xslt/META-INF/MANIFEST.MF
plugins/org.teiid.designer.core.xslt/pom.xml
plugins/org.teiid.designer.core/META-INF/MANIFEST.MF
plugins/org.teiid.designer.core/pom.xml
plugins/org.teiid.designer.datatools.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.datatools.ui/pom.xml
plugins/org.teiid.designer.datatools/META-INF/MANIFEST.MF
plugins/org.teiid.designer.datatools/pom.xml
plugins/org.teiid.designer.ddl.importer.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.ddl.importer.ui/pom.xml
plugins/org.teiid.designer.ddl.importer/META-INF/MANIFEST.MF
plugins/org.teiid.designer.ddl.importer/pom.xml
plugins/org.teiid.designer.ddl.spi/META-INF/MANIFEST.MF
plugins/org.teiid.designer.ddl.spi/pom.xml
plugins/org.teiid.designer.ddl/META-INF/MANIFEST.MF
plugins/org.teiid.designer.ddl/pom.xml
plugins/org.teiid.designer.diagram.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.diagram.ui/pom.xml
plugins/org.teiid.designer.dqp.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.dqp.ui/plugin.properties
plugins/org.teiid.designer.dqp.ui/pom.xml
plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/editor/TeiidServerEditor.java
plugins/org.teiid.designer.dqp/META-INF/MANIFEST.MF
plugins/org.teiid.designer.dqp/pom.xml
plugins/org.teiid.designer.extension.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.extension.ui/pom.xml
plugins/org.teiid.designer.extension/META-INF/MANIFEST.MF
plugins/org.teiid.designer.extension/pom.xml
plugins/org.teiid.designer.jdbc.relational/META-INF/MANIFEST.MF
plugins/org.teiid.designer.jdbc.relational/pom.xml
plugins/org.teiid.designer.jdbc.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.jdbc.ui/pom.xml
plugins/org.teiid.designer.jdbc/META-INF/MANIFEST.MF
plugins/org.teiid.designer.jdbc/pom.xml
plugins/org.teiid.designer.json.lib/META-INF/MANIFEST.MF
plugins/org.teiid.designer.json.lib/pom.xml
plugins/org.teiid.designer.legacy/META-INF/MANIFEST.MF
plugins/org.teiid.designer.legacy/pom.xml
plugins/org.teiid.designer.mapping.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.mapping.ui/pom.xml
plugins/org.teiid.designer.mapping/META-INF/MANIFEST.MF
plugins/org.teiid.designer.mapping/pom.xml
plugins/org.teiid.designer.metamodels.builder.execution/META-INF/MANIFEST.MF
plugins/org.teiid.designer.metamodels.builder.execution/pom.xml
plugins/org.teiid.designer.metamodels.builder/META-INF/MANIFEST.MF
plugins/org.teiid.designer.metamodels.builder/pom.xml
plugins/org.teiid.designer.metamodels.core/META-INF/MANIFEST.MF
plugins/org.teiid.designer.metamodels.core/pom.xml
plugins/org.teiid.designer.metamodels.dependency/META-INF/MANIFEST.MF
plugins/org.teiid.designer.metamodels.dependency/pom.xml
plugins/org.teiid.designer.metamodels.diagram/META-INF/MANIFEST.MF
plugins/org.teiid.designer.metamodels.diagram/pom.xml
plugins/org.teiid.designer.metamodels.function/META-INF/MANIFEST.MF
plugins/org.teiid.designer.metamodels.function/pom.xml
plugins/org.teiid.designer.metamodels.relational/META-INF/MANIFEST.MF
plugins/org.teiid.designer.metamodels.relational/pom.xml
plugins/org.teiid.designer.metamodels.transformation/META-INF/MANIFEST.MF
plugins/org.teiid.designer.metamodels.transformation/pom.xml
plugins/org.teiid.designer.metamodels.webservice/META-INF/MANIFEST.MF
plugins/org.teiid.designer.metamodels.webservice/pom.xml
plugins/org.teiid.designer.metamodels.wsdl/META-INF/MANIFEST.MF
plugins/org.teiid.designer.metamodels.wsdl/pom.xml
plugins/org.teiid.designer.metamodels.xml/META-INF/MANIFEST.MF
plugins/org.teiid.designer.metamodels.xml/pom.xml
plugins/org.teiid.designer.metamodels.xsd.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.metamodels.xsd.ui/pom.xml
plugins/org.teiid.designer.metamodels.xsd/META-INF/MANIFEST.MF
plugins/org.teiid.designer.metamodels.xsd/pom.xml
plugins/org.teiid.designer.modelgenerator.ldap.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.modelgenerator.ldap.ui/pom.xml
plugins/org.teiid.designer.modelgenerator.salesforce.lib/META-INF/MANIFEST.MF
plugins/org.teiid.designer.modelgenerator.salesforce.lib/pom.xml
plugins/org.teiid.designer.modelgenerator.salesforce.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.modelgenerator.salesforce.ui/pom.xml
plugins/org.teiid.designer.modelgenerator.salesforce/META-INF/MANIFEST.MF
plugins/org.teiid.designer.modelgenerator.salesforce/pom.xml
plugins/org.teiid.designer.modelgenerator.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.modelgenerator.ui/pom.xml
plugins/org.teiid.designer.modelgenerator.wsdl.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.modelgenerator.wsdl.ui/pom.xml
plugins/org.teiid.designer.modelgenerator.wsdl/META-INF/MANIFEST.MF
plugins/org.teiid.designer.modelgenerator.wsdl/pom.xml
plugins/org.teiid.designer.modelgenerator.xml/META-INF/MANIFEST.MF
plugins/org.teiid.designer.modelgenerator.xml/pom.xml
plugins/org.teiid.designer.modelgenerator/META-INF/MANIFEST.MF
plugins/org.teiid.designer.modelgenerator/pom.xml
plugins/org.teiid.designer.modeshape/META-INF/MANIFEST.MF
plugins/org.teiid.designer.modeshape/pom.xml
plugins/org.teiid.designer.query.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.query.ui/pom.xml
plugins/org.teiid.designer.relational.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.relational.ui/pom.xml
plugins/org.teiid.designer.relational/META-INF/MANIFEST.MF
plugins/org.teiid.designer.relational/pom.xml
plugins/org.teiid.designer.roles.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.roles.ui/pom.xml
plugins/org.teiid.designer.schema.tools/META-INF/MANIFEST.MF
plugins/org.teiid.designer.schema.tools/pom.xml
plugins/org.teiid.designer.sdt/META-INF/MANIFEST.MF
plugins/org.teiid.designer.sdt/pom.xml
plugins/org.teiid.designer.spi/META-INF/MANIFEST.MF
plugins/org.teiid.designer.spi/pom.xml
plugins/org.teiid.designer.teiidimporter.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.teiidimporter.ui/pom.xml
plugins/org.teiid.designer.tools.textimport.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.tools.textimport.ui/pom.xml
plugins/org.teiid.designer.transformation.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.transformation.ui/pom.xml
plugins/org.teiid.designer.transformation.ui/src/org/teiid/designer/transformation/ui/reconciler/BindingsTablePanel.java
plugins/org.teiid.designer.transformation/META-INF/MANIFEST.MF
plugins/org.teiid.designer.transformation/pom.xml
plugins/org.teiid.designer.udf.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.udf.ui/pom.xml
plugins/org.teiid.designer.udf/META-INF/MANIFEST.MF
plugins/org.teiid.designer.udf/pom.xml
plugins/org.teiid.designer.ui.common/META-INF/MANIFEST.MF
plugins/org.teiid.designer.ui.common/pom.xml
plugins/org.teiid.designer.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.ui/pom.xml
plugins/org.teiid.designer.vdb.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.vdb.ui/pom.xml
plugins/org.teiid.designer.vdb/META-INF/MANIFEST.MF
plugins/org.teiid.designer.vdb/pom.xml
plugins/org.teiid.designer.webservice.lib/META-INF/MANIFEST.MF
plugins/org.teiid.designer.webservice.lib/pom.xml
plugins/org.teiid.designer.webservice.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.webservice.ui/pom.xml
plugins/org.teiid.designer.webservice/META-INF/MANIFEST.MF
plugins/org.teiid.designer.webservice/pom.xml
plugins/org.teiid.designer.xml.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.xml.ui/pom.xml
plugins/org.teiid.designer.xml/META-INF/MANIFEST.MF
plugins/org.teiid.designer.xml/pom.xml
plugins/org.teiid.designer.xsd.ui/META-INF/MANIFEST.MF
plugins/org.teiid.designer.xsd.ui/pom.xml
plugins/org.teiid.designer.xsd/META-INF/MANIFEST.MF
plugins/org.teiid.designer.xsd/pom.xml
plugins/org.teiid.designer/META-INF/MANIFEST.MF
plugins/org.teiid.designer/about.properties
plugins/org.teiid.designer/pom.xml
plugins/teiid/org.teiid.runtime.client/META-INF/MANIFEST.MF
plugins/teiid/org.teiid.runtime.client/pom.xml
site/pom.xml
test-aggregate/org.teiid.designer.aggregate.test/META-INF/MANIFEST.MF
test-aggregate/org.teiid.designer.aggregate.test/pom.xml
tests/org.teiid.core.designer.test.framework/META-INF/MANIFEST.MF
tests/org.teiid.core.designer.test.framework/pom.xml
tests/org.teiid.core.designer.test/META-INF/MANIFEST.MF
tests/org.teiid.core.designer.test/pom.xml
tests/org.teiid.designer.compare.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.compare.test/pom.xml
tests/org.teiid.designer.core.test.framework/META-INF/MANIFEST.MF
tests/org.teiid.designer.core.test.framework/pom.xml
tests/org.teiid.designer.core.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.core.test/pom.xml
tests/org.teiid.designer.core.xslt.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.core.xslt.test/pom.xml
tests/org.teiid.designer.ddl.importer.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.ddl.importer.test/pom.xml
tests/org.teiid.designer.dqp.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.dqp.test/pom.xml
tests/org.teiid.designer.extension.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.extension.test/pom.xml
tests/org.teiid.designer.jdbc.relational.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.jdbc.relational.test/pom.xml
tests/org.teiid.designer.jdbc.test.framework/META-INF/MANIFEST.MF
tests/org.teiid.designer.jdbc.test.framework/pom.xml
tests/org.teiid.designer.jdbc.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.jdbc.test/pom.xml
tests/org.teiid.designer.mapping.ui.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.mapping.ui.test/pom.xml
tests/org.teiid.designer.metamodels.core.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.metamodels.core.test/pom.xml
tests/org.teiid.designer.metamodels.relational.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.metamodels.relational.test/pom.xml
tests/org.teiid.designer.metamodels.transformation.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.metamodels.transformation.test/pom.xml
tests/org.teiid.designer.metamodels.wsdl.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.metamodels.wsdl.test/pom.xml
tests/org.teiid.designer.metamodels.xml.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.metamodels.xml.test/pom.xml
tests/org.teiid.designer.modelgenerator.salesforce.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.modelgenerator.salesforce.test/pom.xml
tests/org.teiid.designer.modelgenerator.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.modelgenerator.test/pom.xml
tests/org.teiid.designer.modelgenerator.wsdl.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.modelgenerator.wsdl.test/pom.xml
tests/org.teiid.designer.query.ui.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.query.ui.test/pom.xml
tests/org.teiid.designer.schema.tools.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.schema.tools.test/pom.xml
tests/org.teiid.designer.sdt.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.sdt.test/pom.xml
tests/org.teiid.designer.spi.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.spi.test/pom.xml
tests/org.teiid.designer.spi.test/src/org/teiid/designer/runtime/version/spi/TestTeiidServerVersion.java
tests/org.teiid.designer.transformation.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.transformation.test/pom.xml
tests/org.teiid.designer.ui.common.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.ui.common.test/pom.xml
tests/org.teiid.designer.ui.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.ui.test/pom.xml
tests/org.teiid.designer.vdb.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.vdb.test/pom.xml
tests/org.teiid.designer.webservice.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.webservice.test/pom.xml
tests/org.teiid.designer.webservice.ui.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.webservice.ui.test/pom.xml
tests/org.teiid.designer.xml.ui.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.xml.ui.test/pom.xml
tests/org.teiid.designer.xsd.ui.test/META-INF/MANIFEST.MF
tests/org.teiid.designer.xsd.ui.test/pom.xml
tests/org.teiid.runtime.client.test/META-INF/MANIFEST.MF
tests/org.teiid.runtime.client.test/pom.xml