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

2014-08-08 Thread stevel
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/c2150453
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c2150453
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c2150453

Branch: refs/heads/develop
Commit: c2150453e0faa5ff4199a95e8885512b0f6a7b36
Parents: bfb4cbb a1bbf4d
Author: Steve Loughran ste...@apache.org
Authored: Fri Aug 8 19:17:32 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Fri Aug 8 19:17:32 2014 +0100

--
 app-packages/hbase/get-hbase-site.sh | 26 +-
 app-packages/hbase/links.py  | 15 +++
 2 files changed, 24 insertions(+), 17 deletions(-)
--




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

2014-08-06 Thread stevel
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/ec760682
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ec760682
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ec760682

Branch: refs/heads/develop
Commit: ec76068292dd5d9c53ce3983dbbbdea1bf793558
Parents: d19c802 533b229
Author: Steve Loughran ste...@apache.org
Authored: Wed Aug 6 19:25:24 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Wed Aug 6 19:25:24 2014 +0100

--
 .../java/org/apache/slider/server/appmaster/state/AppState.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ec760682/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
--



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

2014-07-01 Thread stevel
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/e4723f5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e4723f5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e4723f5e

Branch: refs/heads/develop
Commit: e4723f5e538d15c39320c3651d6bf4c400c59400
Parents: 613dbec be94df3
Author: Steve Loughran ste...@apache.org
Authored: Tue Jul 1 21:44:44 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Tue Jul 1 21:44:44 2014 +0100

--
 app-packages/command-logger/README.txt  |  22 
 .../command-logger/application-pkg/README.txt   |  24 
 .../command-logger/application-pkg/pom.xml  |  83 +
 .../src/command_logger/README.txt   |  18 +++
 .../src/command_logger/operations.log   |  24 
 .../src/packages/tarball/all.xml|  35 ++
 .../command-logger/slider-pkg/appConfig.json|  27 
 .../slider-pkg/configuration/cl-site.xml|  34 ++
 .../command-logger/slider-pkg/metainfo.xml  |  52 
 .../slider-pkg/package/scripts/cl.py|  89 ++
 .../slider-pkg/package/scripts/params.py|  31 +
 .../package/templates/operations.log.j2 |  22 
 app-packages/command-logger/slider-pkg/pom.xml  | 122 +++
 .../command-logger/slider-pkg/resources.json|  15 +++
 .../slider-pkg/src/assembly/command-logger.xml  |  78 
 app-packages/hbase/README.txt   |   2 +-
 app-packages/hbase/appConfig.json   |   4 +-
 pom.xml |   2 +
 .../test_command_log/appConfig.json |   6 +-
 .../test_command_log/appConfig_fast_no_reg.json |   6 +-
 .../test_command_log/appConfig_no_hb.json   |   6 +-
 .../test_command_log/configuration/cl-site.xml  |  34 --
 .../app_packages/test_command_log/metainfo.xml  |  52 
 .../package/files/command_log_10.tar| Bin 2560 - 0 bytes
 .../test_command_log/package/scripts/cl.py  |  89 --
 .../test_command_log/package/scripts/params.py  |  31 -
 .../package/templates/operations.log.j2 |  22 
 slider-funtest/pom.xml  |  52 +++-
 .../lifecycle/AgentCommandTestBase.groovy   |  21 +---
 29 files changed, 747 insertions(+), 256 deletions(-)
--