Branch: refs/heads/port-sle11sp3
Home: https://github.com/yast/yast-nfs-client
Commit: b516c8ceb804ac379624b79f7f6f20b5d2403ec1
https://github.com/yast/yast-nfs-client/commit/b516c8ceb804ac379624b79f7f6f2...
Author: Martin Vidner
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
R .cvsignore
A .gitignore
M VERSION
R agents/.cvsignore
R agents/Makefile.am
R doc/.cvsignore
R doc/autodocs/.cvsignore
M doc/autodocs/Makefile.am
R package/.cvsignore
M package/yast2-nfs-client.changes
R src/.cvsignore
M src/Makefile.am
R src/Nfs.ycp
A src/clients/nfs-client.ycp
A src/clients/nfs-client4part.ycp
A src/clients/nfs.ycp
A src/clients/nfs_auto.ycp
A src/include/nfs/routines.ycp
A src/include/nfs/ui.ycp
A src/include/nfs/wizards.ycp
A src/modules/Nfs.ycp
A src/modules/Nfs/Options.ycp
R src/nfs-client.ycp
R src/nfs-client4part.ycp
M src/nfs.rnc
R src/nfs.ycp
R src/nfs_auto.ycp
R src/routines.ycp
R src/ui.ycp
R src/wizards.ycp
R testsuite/.cvsignore
A testsuite/.gitignore
M testsuite/Makefile.am
A testsuite/tests/autoyast.err
A testsuite/tests/autoyast.out
A testsuite/tests/autoyast.ycp
A testsuite/tests/nfs-options.err
A testsuite/tests/nfs-options.out
A testsuite/tests/nfs-options.ycp
M testsuite/tests/r-check.out
M testsuite/tests/r-check.ycp
M yast2-nfs-client.spec.in
Log Message:
-----------
Merge branch 'Code-11-SP3'
Apart from regular conflict resolution,
special care was needed for AutoYaST profiles,
see src/nfs.rnc and src/modules/Nfs.ycp:GetOptionsAndEntries
Conflicts:
VERSION
package/yast2-nfs-client.changes
src/Makefile.am
src/clients/nfs.ycp
src/include/nfs/ui.ycp
src/include/nfs/wizards.ycp
src/modules/Nfs.ycp
src/nfs.rnc
src/routines.ycp
testsuite/tests/r-check.ycp
testsuite/tests/readwrite.out
testsuite/tests/readwrite2.out
yast2-nfs-client.spec.in
Commit: 8d7557f48a22d16d123d4fc24607001c85b69a1a
https://github.com/yast/yast-nfs-client/commit/8d7557f48a22d16d123d4fc246070...
Author: Martin Vidner
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M src/modules/Nfs.ycp
M testsuite/tests/autoyast.out
M testsuite/tests/autoyast.ycp
Log Message:
-----------
Fix Autoyast merge fallout found by tests.
- test old Import as ImportAny (passing a list)
- Export now produces a map
Commit: 44321324a96f8b7c9266f0bf40d55eaeb6b5745b
https://github.com/yast/yast-nfs-client/commit/44321324a96f8b7c9266f0bf40d55...
Author: Martin Vidner
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M src/Makefile.am
M src/clients/nfs.ycp
M src/include/nfs/ui.ycp
M src/modules/Nfs.ycp
R src/modules/Nfs/Options.ycp
A src/modules/NfsOptions.ycp
M testsuite/tests/nfs-options.out
M testsuite/tests/nfs-options.ycp
M yast2-nfs-client.spec.in
Log Message:
-----------
moved Nfs::Options to NfsOptions
y2r cannot handle it.
I was too clever. Stupid me.
Commit: f988c47cee1033aa03e9e679f20aba9a57e70d90
https://github.com/yast/yast-nfs-client/commit/f988c47cee1033aa03e9e679f20ab...
Author: Martin Vidner
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M src/modules/Nfs.ycp
Log Message:
-----------
Fixed minor issues according to review.
Compare: https://github.com/yast/yast-nfs-client/compare/b516c8ceb804^...f988c47cee10
