Branch: refs/heads/rubocop-master Home: https://github.com/yast/yast-nfs-client Commit: b5d71cbc6a41c77fc80f2e7ab1f5119f885d276e https://github.com/yast/yast-nfs-client/commit/b5d71cbc6a41c77fc80f2e7ab1f51... Author: Martin Vidner <mvidner@suse.cz> Date: 2015-01-20 (Tue, 20 Jan 2015) Changed paths: A .rubocop.yml A .rubocop_yast_style.yml M .travis.yml M Rakefile M package/yast2-nfs-client.changes M package/yast2-nfs-client.spec M src/clients/nfs-client.rb M src/clients/nfs-client4part.rb M src/clients/nfs.rb M src/clients/nfs_auto.rb M src/include/nfs/routines.rb M src/include/nfs/ui.rb M src/include/nfs/wizards.rb M src/modules/Nfs.rb M src/modules/NfsOptions.rb M test/nfs_options_test.rb M testsuite/tests/autoyast.rb M testsuite/tests/escape.rb R testsuite/tests/nfs-options.err R testsuite/tests/nfs-options.out R testsuite/tests/nfs-options.rb A testsuite/tests/nfs_options.err A testsuite/tests/nfs_options.out A testsuite/tests/nfs_options.rb R testsuite/tests/r-check.err R testsuite/tests/r-check.out R testsuite/tests/r-check.rb R testsuite/tests/r-fstab.err R testsuite/tests/r-fstab.out R testsuite/tests/r-fstab.rb R testsuite/tests/r-spec.err R testsuite/tests/r-spec.out R testsuite/tests/r-spec.rb R testsuite/tests/r-strip.err R testsuite/tests/r-strip.out R testsuite/tests/r-strip.rb A testsuite/tests/r_check.err A testsuite/tests/r_check.out A testsuite/tests/r_check.rb A testsuite/tests/r_fstab.err A testsuite/tests/r_fstab.out A testsuite/tests/r_fstab.rb A testsuite/tests/r_spec.err A testsuite/tests/r_spec.out A testsuite/tests/r_spec.rb A testsuite/tests/r_strip.err A testsuite/tests/r_strip.out A testsuite/tests/r_strip.rb M testsuite/tests/readwrite.rb M testsuite/tests/readwrite2.rb Log Message: ----------- Merge branch 'SLE-12-GA' Conflicts: .travis.yml Rakefile package/yast2-nfs-client.spec Commit: 3a1cf8a6f630c7ccf40dec475a4b213c290be1be https://github.com/yast/yast-nfs-client/commit/3a1cf8a6f630c7ccf40dec475a4b2... Author: Martin Vidner <mvidner@suse.cz> Date: 2015-01-20 (Tue, 20 Jan 2015) Changed paths: M .rubocop.yml R .rubocop_yast_style.yml M package/yast2-nfs-client.spec Log Message: ----------- rubocop: use the shared YaST configuration. Compare: https://github.com/yast/yast-nfs-client/compare/b5d71cbc6a41^...3a1cf8a6f630