[48/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/e5fd0622/gateway-server/src/test/java/org/apache/knox/gateway/topology/monitor/ZooKeeperConfigurationMonitorTest.java -- diff --cc

[40/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

Merge branch 'master' into KNOX-998-Package_Restructuring # Conflicts: # gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscovery.java #

[25/53] [abbrv] knox git commit: KNOX-998 - Some more refactoring

KNOX-998 - Some more refactoring Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/1451428f Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/1451428f Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/1451428f Branch:

[24/53] [abbrv] knox git commit: KNOX-998 - Some more refactoring

http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-utils/src/main/java/org/apache/hadoop/test/mock/MockHttpServletRequest.java -- diff --git

[34/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/22a7304a/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java -- diff --cc

[42/53] [abbrv] knox git commit: KNOX-998 - Merge from trunk 0.14.0 code

http://git-wip-us.apache.org/repos/asf/knox/blob/e766b3b7/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/util/RemoteRegistryConfigTestUtils.java -- diff --git

[45/53] [abbrv] knox git commit: KNOX-998 - Merge from trunk 0.14.0 code

http://git-wip-us.apache.org/repos/asf/knox/blob/e766b3b7/gateway-server/src/test/java/org/apache/hadoop/gateway/service/config/remote/LocalFileSystemRemoteConfigurationRegistryClientService.java -- diff --git

[49/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/e5fd0622/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java -- diff --cc gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java index

[52/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

Merge branch 'master' into KNOX-998-Package_Restructuring # Conflicts: # gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit:

[26/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/2c69152f/gateway-test/src/test/java/org/apache/knox/gateway/deploy/DeploymentFactoryFuncTest.java -- diff --cc

[11/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/58780d37/gateway-service-knoxsso/src/test/java/org/apache/knox/gateway/service/knoxsso/WebSSOResourceTest.java -- diff --cc

[30/53] [abbrv] knox git commit: KNOX-998 - Bring branch up to speed with 0.14.0 RC1

KNOX-998 - Bring branch up to speed with 0.14.0 RC1 Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/e70904b3 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/e70904b3 Diff:

[37/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/22a7304a/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java -- diff --cc

[53/53] [abbrv] knox git commit: KNOX-998 - Merge from 0.14.0 master

KNOX-998 - Merge from 0.14.0 master Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/92e2ec59 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/92e2ec59 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/92e2ec59

[19/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/c754cc06/gateway-server/src/main/java/org/apache/knox/gateway/GatewayMessages.java -- diff --cc gateway-server/src/main/java/org/apache/knox/gateway/GatewayMessages.java index

[16/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/c754cc06/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAdminTopologyFuncTest.java -- diff --cc

[51/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/e5fd0622/gateway-discovery-ambari/src/test/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariDynamicServiceURLCreatorTest.java -- diff --cc

[31/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/22a7304a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayBasicFuncTest.java -- diff --cc gateway-test/src/test/java/org/apache/knox/gateway/GatewayBasicFuncTest.java

[18/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/c754cc06/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java -- diff --cc

[35/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/22a7304a/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java -- diff --cc gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java index

[20/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

Merge branch 'master' into KNOX-998-Package_Restructuring # Conflicts: # gateway-demo-ldap/src/main/java/org/apache/knox/gateway/security/ldap/BaseDirectoryService.java # gateway-demo-ldap/src/main/java/org/apache/knox/gateway/security/ldap/BaseDirectoryServiceFactory.java #

[47/53] [abbrv] knox git commit: KNOX-998 - Merge from trunk 0.14.0 code

KNOX-998 - Merge from trunk 0.14.0 code Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/e766b3b7 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/e766b3b7 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/e766b3b7

[10/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/58780d37/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWTToken.java -- diff --cc

[38/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/22a7304a/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/Pac4jProviderTest.java -- diff --cc

[21/53] [abbrv] knox git commit: KNOX-998 - Merge from master

KNOX-998 - Merge from master Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/46109ad8 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/46109ad8 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/46109ad8 Branch:

[32/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/22a7304a/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java -- diff --cc gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java index

[33/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/22a7304a/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java -- diff --cc gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java index

[07/53] [abbrv] knox git commit: KNOX-998 - package name refactoring

http://git-wip-us.apache.org/repos/asf/knox/blob/7d0bff16/gateway-server/src/main/java/org/apache/knox/gateway/websockets/ProxyInboundClient.java -- diff --git

[09/53] [abbrv] knox git commit: KNOX-998 - package name refactoring

KNOX-998 - package name refactoring Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/7d0bff16 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/7d0bff16 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/7d0bff16

[46/53] [abbrv] knox git commit: KNOX-998 - Merge from trunk 0.14.0 code

http://git-wip-us.apache.org/repos/asf/knox/blob/e766b3b7/gateway-discovery-ambari/src/test/java/org/apache/hadoop/gateway/topology/discovery/ambari/AmbariConfigurationMonitorTest.java -- diff --git

[43/53] [abbrv] knox git commit: KNOX-998 - Merge from trunk 0.14.0 code

http://git-wip-us.apache.org/repos/asf/knox/blob/e766b3b7/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/zk/ZooKeeperClientServiceProvider.java -- diff --git

[41/53] [abbrv] knox git commit: KNOX-998 - Merge from trunk 0.14.0 code

http://git-wip-us.apache.org/repos/asf/knox/blob/e766b3b7/gateway-test/src/test/java/org/apache/hadoop/gateway/topology/monitor/RemoteConfigurationMonitorTest.java -- diff --git

[17/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/c754cc06/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java -- diff --cc

[22/53] [abbrv] knox git commit: KNOX-998 - Some more refactoring

http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test/src/test/java/org/apache/knox/gateway/deploy/DeploymentFactoryFuncTest.java -- diff --git

[23/53] [abbrv] knox git commit: KNOX-998 - Some more refactoring

http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockHttpServletRequest.java -- diff --git

[14/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

Merge branch 'master' into KNOX-998-Package_Restructuring # Conflicts: # gateway-provider-rewrite-func-hostmap-static/src/main/resources/META-INF/services/org.apache.knox.gateway.deploy.ProviderDeploymentContributor #

[08/53] [abbrv] knox git commit: KNOX-998 - package name refactoring

http://git-wip-us.apache.org/repos/asf/knox/blob/7d0bff16/gateway-discovery-ambari/src/test/java/org/apache/hadoop/gateway/topology/discovery/ambari/AmbariDynamicServiceURLCreatorTest.java -- diff --git

[05/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

Merge branch 'master' into KNOX-998-Package_Restructuring # Conflicts: # gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceURLCreator.java #

[27/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/2c69152f/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java -- diff --cc

[50/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/e5fd0622/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java -- diff --cc

[28/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/2c69152f/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorImpl.java -- diff --cc

[39/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/22a7304a/gateway-discovery-ambari/src/test/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscoveryTest.java -- diff --cc

[06/53] [abbrv] knox git commit: KNOX-1081 - Manually remove the picketlink folder because of merge issue

KNOX-1081 - Manually remove the picketlink folder because of merge issue Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/78d35f16 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/78d35f16 Diff:

[01/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

Repository: knox Updated Branches: refs/heads/master 99e6a54af -> 92e2ec59a http://git-wip-us.apache.org/repos/asf/knox/blob/8affbc02/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/ParserTest.java

[04/53] [abbrv] knox git commit: Merge branch 'master' into KNOX-998-Package_Restructuring

http://git-wip-us.apache.org/repos/asf/knox/blob/8affbc02/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java -- diff --cc