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 15:38:27 UTC

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

Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-juneau.git

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

Branch: refs/heads/master
Commit: cb4a4f2a5b0c7b570b08a217f4786024191c84a6
Parents: 0ce0e66 ee27361
Author: jamesbognar <ja...@gmail.com>
Authored: Sat Aug 27 11:37:34 2016 -0400
Committer: jamesbognar <ja...@gmail.com>
Committed: Sat Aug 27 11:38:05 2016 -0400

----------------------------------------------------------------------
 juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/cb4a4f2a/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
----------------------------------------------------------------------
diff --cc juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
index 2027c55,16ec115..c417341
--- a/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
+++ b/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
@@@ -82,7 -82,7 +82,7 @@@ import org.apache.juneau.transform.*
  public @interface Pojo {
  
  	/**
- 	 * Associate a {@link PojoSwap} or {@link SurrogateSwap} with this class type.
 -	 * The transform class.
++	 * Associate a {@link PojoSwap} or {@link SurrogateSwap} with this class type. 
  	 */
  	Class<? extends Transform> transform() default Transform.NULL.class;
  }