Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge the SLE11-SP3 branch to Factory #13

Merged
merged 55 commits into from
Sep 13, 2013
Merged

Merge the SLE11-SP3 branch to Factory #13

merged 55 commits into from
Sep 13, 2013

Conversation

mvidner
Copy link
Member

@mvidner mvidner commented Jul 30, 2013

  • refactored the last change following a late review
    (FATE#312242, bnc#820989)
  • AutoYaST: fix to allow NFS4 options (FATE#312242, bnc#457981)
  • added option for enabling NFS4 GSS (FATE#312242, bnc#681190)
  • Added minorversion=1 for pNFS, NFS4.1 (FATE#312259).
  • enable compiling, testing, packaging from the WC (bnc#790490)

Katarína Machálková and others added 30 commits December 16, 2008 12:43
Consistent widget focusing (#435992)
3bd8fbe 
svn path=/branches/SuSE-Code-11-Branch/nfs-client/; revision=54164
@jsrain
merged the tmp/SLE-11-SP1-Stash branch
9ce4311 
svn path=/branches/SuSE-Code-11-SP1-Branch/nfs-client/; revision=58763
@jreidinger
Fixed attempt to install rpmbind to inst-sys during installation(bnc#…
9768caa 
…621197)

svn path=/branches/SuSE-Code-11-SP2-Branch/nfs-client/; revision=64522
@jreidinger
allow to set version of nfs on command line and also fix passing defa…
c86fe66 
…ult value (bnc#681275)

svn path=/branches/SuSE-Code-11-SP2-Branch/nfs-client/; revision=64543
@jreidinger
fix enablement of NFSv4 in autoyast (bnc#684859)
25895b2 
svn path=/branches/SuSE-Code-11-SP2-Branch/nfs-client/; revision=64596
@jreidinger
changes
4aa5eb0 
svn path=/branches/SuSE-Code-11-SP2-Branch/nfs-client/; revision=64597
@jreidinger
versin bump
cc101fb 
svn path=/branches/SuSE-Code-11-SP2-Branch/nfs-client/; revision=64598
@mvidner
Use ButtonBoxes, use Wizard::OpenOKDialog
5a03805 
svn path=/trunk/nfs-client/; revision=60690
@mvidner
added fix for handling button OK bnc#589541
b6a095d 
svn path=/trunk/nfs-client/; revision=61434

Conflicts:

	VERSION
	package/yast2-nfs-client.changes
@mvidner
Taking the package (back) after Bubli has changed teams.
56ad419 
svn path=/trunk/nfs-client/; revision=61452
@mvidner
Adjusted the changelog of the ported changes.
1d40282 
Conflicts:

	package/yast2-nfs-client.changes
@mvidner
Base server hostname combobox on existing values - bnc#547983
e6749b7 
Conflicts:

	package/yast2-nfs-client.changes
@mchf @mvidner
autoinstallation fails to enable rpcbind / portmapper - bnc#744357
34a9945 
svn path=/trunk/nfs-client/; revision=67463

Conflicts:

	package/yast2-nfs-client.changes

Conflicts:

	package/yast2-nfs-client.changes
@mchf @mvidner
removed some dead code, whitespaces
f7d8f42 
svn path=/trunk/nfs-client/; revision=67465

Conflicts:

	src/Nfs.ycp

Conflicts:

	package/yast2-nfs-client.changes
@mchf @mvidner
IPv6 addresses supported - bnc#719538
aac7b00 
svn path=/trunk/nfs-client/; revision=67469

Conflicts:

	VERSION

Conflicts:

	package/yast2-nfs-client.changes
@mchf @mvidner
Fixed indentation.
ad2539d 
Conflicts:

	src/routines.ycp
@mchf @mvidner
Fixed support for IPv6 addresses.
33de4ff 
1) Allows IPv6 enclosed in square brackets.
2) Added support for IPv6 link-local.
3) Fixed writing IPv6 into fstab.
All IPv6 addresses has to be enclosed in square brackets.

Additional fix for bnc#719538
@mchf @mvidner
Updated testsuite.
034abca 
Added tests for various IPv6 possibilities.
@mchf @mvidner
Updated changelog.
2dad958 
Conflicts:

	VERSION
	package/yast2-nfs-client.changes

Conflicts:

	package/yast2-nfs-client.changes
@mchf @mvidner
Updated testsuite for IPv6 inputs.
e33aafc
@mchf @mvidner
Part of IPv6 specific checking moved to yast-yast2.
af57a16 
Minor refactoring in CheckHostname.
@mchf @mvidner
Updated spec file.
77395a1 
Conflicts:

	yast2-nfs-client.spec.in
@mchf
Merge pull request yast#4 from mvidner/Code-11-SP2
07015b2 
Port accumulated fixes from master
@mvidner
enable compiling, testing, packaging from the WC (bnc#790490)
d5381a2 
by mimicking the runtime directory layout
@mvidner
removed an unused directory
3c50e4d
@mvidner
gitignore
dd3d419
@mvidner
VERSION + .changes
e73e82d
@kobliha
Merge pull request yast#5 from mvidner/Code-11-SP2
689ebdc 
enable compiling, testing, packaging from the WC (bnc#790490)
@mvidner
Factored out backends of probing pop-ups from GetFstabEntry.
2a4e799 
doc typo: the correct key is "mntops"
@mvidner
renamed check_options to Nfs::Options::validate
3354f0c
@mvidner
test the refactoring. caught a corner case
e74271d
@mvidner
.changes
ca5d7f8
@mvidner
Merge branch 'Code-11-SP3'
b516c8c 
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
@mvidner
Fix Autoyast merge fallout found by tests.
8d7557f 
- test old Import as ImportAny (passing a list)
- Export now produces a map
@mvidner
moved Nfs::Options to NfsOptions
4432132 
y2r cannot handle it.
I was too clever. Stupid me.
mvidner added a commit to mvidner/ycp-killer that referenced this pull request Jul 30, 2013
@mvidner
Adapt to yast/yast-nfs-client#13
8ea0223
@mvidner
Copy link
Member Author

mvidner commented Jul 30, 2013

Here is the diff of the big merge compared to the previous master: yast:fa57ab06ed45c9c3ea5131a34d86fb3fd5052b75...b516c8c
But it is better to compare locally because of moved files:
git diff -M50 fa57ab06ed45c9c3ea5131a34d86fb3fd5052b75...b516c8ceb804ac379624b79f7f6f20b5d2403ec1

@jreidinger
Copy link
Member

really big pull request, but lets hope that previous reviews catch it. changes merge looks good

@mvidner
Copy link
Member Author

mvidner commented Jul 30, 2013

A comforting description is that it is "just a merge of a table branch". But that is incorrect. It contains some gotchas

  • two Fate entries; which have been reviewed already
  • source tree restructuring which predates the one in YCP killer; there were problems which I solved, see the YK PR
  • as usual, there might be hidden problems with merging the boring code
  • the autoyast schema compatibility is really tricky and needs review here!

FWIW, it passes my build test (git -> clean chroot -> local osc build).

mvidner
mvidner reviewed Jul 30, 2013
View reviewed changes
src/modules/Nfs.ycp
}

/**
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The juicy part involving AutoYaST starts here.

@jreidinger
Copy link
Member

except notes, LGTM

@mvidner
Copy link
Member Author

mvidner commented Jul 30, 2013

OK. So I will "merge" this by converting to Ruby and then applying the diff between the hello-ruby tag and the conversion result on top of hello-ruby (taking into account that hello-ruby will move as the gitignore problem is being fixed).

@dmajda dmajda mentioned this pull request Aug 6, 2013
Closed
@mvidner
yk restructure
be54246
@mvidner
yk patch
045dbdb 
actually had to apply the patch by hand, but that was easy
@mvidner
yk ruby
ccde9a1
@mvidner
yk makefile
4e75678
@mvidner
Merge branch 'master' into port-sle11sp3
700a1ba 
Conflicts:
	VERSION
	src/Makefile.am
	src/autoyast-rnc/nfs.rnc
	src/clients/nfs.rb
	src/include/nfs/routines.rb
	src/include/nfs/ui.rb
	src/modules/Nfs.rb
	testsuite/tests/r-check.rb
	yast2-nfs-client.spec.in
@mvidner
Copy link
Member Author

mvidner commented Sep 13, 2013

So I worked a bit differently:

It simply worked!

@jreidinger
Copy link
Member

well, I find it quite hard to review and when branches divert more it will be even harder

@mvidner
Copy link
Member Author

mvidner commented Sep 13, 2013

I'm pretty sure they will not diverge further, at least in this repo. But yes, my mistakes are:

  • submitting at the last moment, again
  • not separating the compatibility code from the merge (they are mixed up in b516c8c)

If I promise not to do it again, will you let me merge it, pretty please?

@jreidinger
Copy link
Member

yes

mvidner added a commit that referenced this pull request Sep 13, 2013
@mvidner
Merge pull request #13 from mvidner/master
34cc8d8 
Merge the SLE11-SP3 branch to Factory
@mvidner mvidner merged commit 34cc8d8 into yast:master Sep 13, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@mvidner @jreidinger @kobliha @jsrain @mchf