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/07/13 18:09:58 UTC
[1/3] incubator-slider git commit: tabs to spaces
Repository: incubator-slider
Updated Branches:
refs/heads/develop e9daccd5e -> ac3580eca
tabs to spaces
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b8e27119
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b8e27119
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b8e27119
Branch: refs/heads/develop
Commit: b8e27119367c4182efab5e786c36669ab78ed189
Parents: e9daccd
Author: Steve Loughran <st...@apache.org>
Authored: Mon Jul 13 16:53:22 2015 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Jul 13 16:53:22 2015 +0100
----------------------------------------------------------------------
.../apache/slider/common/params/ActionDiagnosticArgs.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b8e27119/slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java
index 4b03336..c891873 100644
--- a/slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java
+++ b/slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java
@@ -37,7 +37,7 @@ public class ActionDiagnosticArgs extends AbstractActionArgs {
@Parameter(names = {ARG_CLIENT},
description = "print configuration of the slider client")
public boolean client = false;
-
+
@Parameter(names = {ARG_APPLICATION},
description = "print configuration of the running application")
public boolean application;
@@ -49,15 +49,15 @@ public class ActionDiagnosticArgs extends AbstractActionArgs {
@Parameter(names = {ARG_YARN},
description = "print configuration of the YARN cluster")
public boolean yarn = false;
-
+
@Parameter(names = {ARG_CREDENTIALS},
description = "print credentials of the current user")
public boolean credentials = false;
-
+
@Parameter(names = {ARG_ALL},
description = "print all of the information above")
public boolean all;
-
+
@Parameter(names = {ARG_LEVEL},
description = "diagnose each slider configuration one by one")
public boolean level;
[2/3] incubator-slider git commit: JDK7 exception handling
Posted by st...@apache.org.
JDK7 exception handling
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/cd535c8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/cd535c8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/cd535c8d
Branch: refs/heads/develop
Commit: cd535c8d2777dc29465c1bb2ffafb1f0a66f12c2
Parents: b8e2711
Author: Steve Loughran <st...@apache.org>
Authored: Mon Jul 13 16:53:46 2015 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Jul 13 16:53:46 2015 +0100
----------------------------------------------------------------------
.../web/rest/management/TestAMManagementWebServices.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/cd535c8d/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java
----------------------------------------------------------------------
diff --git a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java
index 90d40c6..7cb9395 100644
--- a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java
+++ b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java
@@ -177,14 +177,7 @@ public class TestAMManagementWebServices extends JerseyTest {
fs,
historyPath,
null, null, new SimpleReleaseSelector());
-// JDK7 } catch (IOException | BadClusterStateException | URISyntaxException | BadConfigException e) {
- } catch (IOException e) {
- log.error("{}", e, e);
- } catch (BadClusterStateException e) {
- log.error("{}", e, e);
- } catch (URISyntaxException e) {
- log.error("{}", e, e);
- } catch (BadConfigException e) {
+ } catch (IOException | BadClusterStateException | URISyntaxException | BadConfigException e) {
log.error("{}", e, e);
}
ProviderAppState providerAppState = new ProviderAppState("undefined",
[3/3] incubator-slider git commit: SLIDER-912 x-insecure rest API
should be off by default
Posted by st...@apache.org.
SLIDER-912 x-insecure rest API should be off by default
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ac3580ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ac3580ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ac3580ec
Branch: refs/heads/develop
Commit: ac3580eca5a9e58dc3941591f2a06f013cc1aedb
Parents: cd535c8
Author: Steve Loughran <st...@apache.org>
Authored: Mon Jul 13 17:10:07 2015 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Jul 13 17:10:07 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/slider/common/SliderXmlConfKeys.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ac3580ec/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java b/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java
index 4e9d8c6..3d2b868 100644
--- a/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java
+++ b/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java
@@ -149,9 +149,8 @@ public interface SliderXmlConfKeys {
/**
* Flag to indicate the insecure AM filter is enabled by default: {@value}.
- * THIS IS CURRENTLY TRUE: NOT FOR RELEASE
*/
- boolean X_DEV_INSECURE_DEFAULT = true;
+ boolean X_DEV_INSECURE_DEFAULT = false;
/**