Merge "Replace dlux with dluxapps features"

author Kai Gao <gaok12@mails.tsinghua.edu.cn>

Sat, 14 Jan 2017 17:32:29 +0000 (17:32 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Sat, 14 Jan 2017 17:32:29 +0000 (17:32 +0000)
author Kai Gao <gaok12@mails.tsinghua.edu.cn>
Sat, 14 Jan 2017 17:32:29 +0000 (17:32 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Sat, 14 Jan 2017 17:32:29 +0000 (17:32 +0000)
diff --cc alto-release-features/pom.xml
Simple merge
diff --cc alto-release-features/src/main/features/features.xml
Simple merge
author	Kai Gao <gaok12@mails.tsinghua.edu.cn>
	Sat, 14 Jan 2017 17:32:29 +0000 (17:32 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Sat, 14 Jan 2017 17:32:29 +0000 (17:32 +0000)
		1	2
alto-release-features/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
alto-release-features/src/main/features/features.xml	patch \|	diff1 \|	diff2 \|	blob \| history