You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/12/26 12:56:20 UTC

[1/3] camel git commit: Fixed wrong default

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 437ade9c0 -> 1515c55b5
  refs/heads/master d22452580 -> 2a5659da3


Fixed wrong default


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2a5659da
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2a5659da
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2a5659da

Branch: refs/heads/master
Commit: 2a5659da305f72d9c965d18759bdd09ba4bcc25a
Parents: d224525
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Dec 26 13:54:57 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 26 13:54:57 2016 +0100

----------------------------------------------------------------------
 .../org/apache/camel/model/HystrixConfigurationDefinition.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2a5659da/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java b/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
index 6a6d6e5..ab35f2d 100644
--- a/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
@@ -93,7 +93,7 @@ public class HystrixConfigurationDefinition extends IdentifiedType {
     @Metadata(label = "command", defaultValue = "true")
     private Boolean metricsRollingPercentileEnabled;
     @XmlAttribute
-    @Metadata(label = "command", defaultValue = "false")
+    @Metadata(label = "command", defaultValue = "10000")
     private Integer metricsRollingPercentileWindowInMilliseconds;
     @XmlAttribute
     @Metadata(label = "command", defaultValue = "6")

[3/3] camel git commit: Fixed wrong default

Posted by da...@apache.org.
Fixed wrong default


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1515c55b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1515c55b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1515c55b

Branch: refs/heads/camel-2.18.x
Commit: 1515c55b5a349951b9c68f64ed990473037f3a85
Parents: 07a38f6
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Dec 26 13:54:57 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 26 13:55:37 2016 +0100

----------------------------------------------------------------------
 .../org/apache/camel/model/HystrixConfigurationDefinition.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/1515c55b/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java b/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
index 9a02058..6338a9a 100644
--- a/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
@@ -93,7 +93,7 @@ public class HystrixConfigurationDefinition extends IdentifiedType {
     @Metadata(label = "command", defaultValue = "true")
     private Boolean metricsRollingPercentileEnabled;
     @XmlAttribute
-    @Metadata(label = "command", defaultValue = "false")
+    @Metadata(label = "command", defaultValue = "10000")
     private Integer metricsRollingPercentileWindowInMilliseconds;
     @XmlAttribute
     @Metadata(label = "command", defaultValue = "6")

[2/3] camel git commit: Upgrade swagger

Posted by da...@apache.org.
Upgrade swagger


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/07a38f6b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/07a38f6b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/07a38f6b

Branch: refs/heads/camel-2.18.x
Commit: 07a38f6b6f5e2dd1508fc11840046c62c8cd2e07
Parents: 437ade9
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Dec 25 11:39:08 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 26 13:55:26 2016 +0100

----------------------------------------------------------------------
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/07a38f6b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index bc32e9d..4af1034 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -585,7 +585,7 @@
     <swagger-scala-version>1.3.12</swagger-scala-version>
     <swagger-scala-guava-version>15.0</swagger-scala-guava-version>
     <swagger-scala-bundle-version>1.3.12_1</swagger-scala-bundle-version>
-    <swagger-java-version>1.5.10</swagger-java-version>
+    <swagger-java-version>1.5.11</swagger-java-version>
     <swagger-java-parser-version>1.0.22</swagger-java-parser-version>
     <swagger-java-guava-version>18.0</swagger-java-guava-version>
     <stax-api-version>1.0.1</stax-api-version>