You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2015/06/03 11:58:10 UTC

[1/2] incubator-slider git commit: SLIDER-481 giving registry log messages meaningful text

Repository: incubator-slider
Updated Branches:
  refs/heads/develop af62e17a9 -> 9adf4d3c6


SLIDER-481 giving registry log messages meaningful text


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/63b08d11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/63b08d11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/63b08d11

Branch: refs/heads/develop
Commit: 63b08d116befaf0b6e83d3723d1019b0f2b6de18
Parents: 38bba06
Author: Steve Loughran <st...@apache.org>
Authored: Wed Jun 3 10:57:47 2015 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Jun 3 10:57:47 2015 +0100

----------------------------------------------------------------------
 .../server/appmaster/web/rest/publisher/PublisherResource.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/63b08d11/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java
index b4a72b4..58d6a8e 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java
@@ -113,7 +113,7 @@ public class PublisherResource extends AbstractSliderResource {
     UriMap uriMap = new UriMap();
     for (String name : appState.listConfigSets()) {
       uriMap.put(name, baseURL + name);
-      log.info("Tick tack {} and {}", name, baseURL);
+      log.info("registering config set {} at {}", name, baseURL);
     }
     uriMap.put(EXPORTS_NAME, baseURL + EXPORTS_NAME);
     return uriMap;


[2/2] incubator-slider git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider into develop

Posted by st...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/9adf4d3c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9adf4d3c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9adf4d3c

Branch: refs/heads/develop
Commit: 9adf4d3c66d691b2c938e503429b83d4489e6eb3
Parents: 63b08d1 af62e17
Author: Steve Loughran <st...@apache.org>
Authored: Wed Jun 3 10:58:00 2015 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Jun 3 10:58:00 2015 +0100

----------------------------------------------------------------------
 .../accumulo/appConfig-secured-default.json         |  1 +
 .../package/scripts/accumulo_configuration.py       | 16 ++++++++++++++++
 .../funtest/accumulo/AccumuloReadWriteIT.groovy     |  8 ++++++--
 app-packages/solr/README.md                         |  2 --
 app-packages/solr/metainfo.xml                      |  6 +-----
 .../apache/slider/client/TestClientBasicArgs.groovy |  2 +-
 .../providers/agent/TestAgentClientProvider2.java   |  8 ++++++--
 7 files changed, 31 insertions(+), 12 deletions(-)
----------------------------------------------------------------------