You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2016/08/27 16:28:37 UTC
[1/4] incubator-juneau git commit: Merge remote-tracking branch
'origin/master'
Repository: incubator-juneau
Updated Branches:
refs/heads/master 3e1a66855 -> 36f1b535e
Merge remote-tracking branch 'origin/master'
Conflicts:
juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/951a3217
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/951a3217
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/951a3217
Branch: refs/heads/master
Commit: 951a32170a69d622992edcc5d8c94ebb3dc68abf
Parents: a91a56f cb4a4f2
Author: jamesbognar <ja...@gmail.com>
Authored: Sat Aug 27 11:58:25 2016 -0400
Committer: jamesbognar <ja...@gmail.com>
Committed: Sat Aug 27 12:12:26 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/4] incubator-juneau git commit: Test2
Posted by ja...@apache.org.
Test2
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/36f1b535
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/36f1b535
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/36f1b535
Branch: refs/heads/master
Commit: 36f1b535e5b90a0cef16989feefb582f65b1597d
Parents: 6a67396
Author: jamesbognar <ja...@gmail.com>
Authored: Sat Aug 27 12:28:31 2016 -0400
Committer: jamesbognar <ja...@gmail.com>
Committed: Sat Aug 27 12:28:31 2016 -0400
----------------------------------------------------------------------
juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/36f1b535/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java b/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
index 64143e0..3a4d98e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
+++ b/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
@@ -33,7 +33,6 @@ public @interface Pojo {
/**
* Associate a {@link PojoSwap} or {@link SurrogateSwap} with this class type.
- *
* <p>
* Supports the following class types:
* <ul>
[2/4] incubator-juneau git commit: Test
Posted by ja...@apache.org.
Test
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/490038ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/490038ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/490038ff
Branch: refs/heads/master
Commit: 490038ffff7b4852cfcf5d80993f961f1cfba51f
Parents: 951a321
Author: jamesbognar <ja...@gmail.com>
Authored: Sat Aug 27 12:13:08 2016 -0400
Committer: jamesbognar <ja...@gmail.com>
Committed: Sat Aug 27 12:13:08 2016 -0400
----------------------------------------------------------------------
juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/490038ff/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java b/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
index 3a4d98e..64143e0 100644
--- a/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
+++ b/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
@@ -33,6 +33,7 @@ public @interface Pojo {
/**
* Associate a {@link PojoSwap} or {@link SurrogateSwap} with this class type.
+ *
* <p>
* Supports the following class types:
* <ul>
[3/4] incubator-juneau git commit: Merge remote-tracking branch
'origin/master'
Posted by ja...@apache.org.
Merge remote-tracking branch 'origin/master'
# Conflicts:
# juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/6a673967
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/6a673967
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/6a673967
Branch: refs/heads/master
Commit: 6a6739678d01cf93f844cae04e4a218e3c069251
Parents: 490038f 3e1a668
Author: jamesbognar <ja...@gmail.com>
Authored: Sat Aug 27 12:28:13 2016 -0400
Committer: jamesbognar <ja...@gmail.com>
Committed: Sat Aug 27 12:28:13 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------