Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge commit 'simong/master'

* commit 'simong/master':
  Changed the sakai:propertiesmix nodetype so that we can now have multivalued properties beside sakai:labels as well.

Conflicts:
	slingtests/osgikernel/bundles/messaging/src/main/java/org/sakaiproject/kernel/api/message/MessageConstants.java
  • Loading branch information...
commit 50835e194c768aa76b3466d8cb8b5d8c0263fe21 2 parents d28cfaf + fb3e4ff
@ieb ieb authored
View
1  ...sts/osgikernel/bundles/messaging/src/main/java/org/sakaiproject/kernel/api/message/MessageConstants.java
@@ -178,5 +178,4 @@
*/
public static final String REG_PROCESSOR_NAMES = "sakai.message.createpreprocessor";
public static final String MESSAGE_CREATE_PREPROCESSOR = "CreateMessagePreProcessor";
-
}
View
4 slingtests/osgikernel/bundles/site/src/main/resources/SLING-INF/nodetypes/site.cnd
@@ -15,6 +15,10 @@
- '*' (undefined)
copy
+ multiple
+
+ - '*' (undefined)
+ copy
- 'sakai:labels' (string)
copy
Please sign in to comment.
Something went wrong with that request. Please try again.