diff options
author | Micael Karlberg <[email protected]> | 2011-04-01 12:07:23 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-04-01 12:07:23 +0200 |
commit | 2b46b0e42fe95d99619ffa343537c8468e27295c (patch) | |
tree | 9f01a4f4a6ad597299aa5a74e5e50a58e9d5812b /lib/reltool | |
parent | 537f010d6fe871d55c3becb02fe6ebb73dc2d55a (diff) | |
parent | 49737813349f164b35737eb3cd59491930128f58 (diff) | |
download | otp-2b46b0e42fe95d99619ffa343537c8468e27295c.tar.gz otp-2b46b0e42fe95d99619ffa343537c8468e27295c.tar.bz2 otp-2b46b0e42fe95d99619ffa343537c8468e27295c.zip |
Merge branch 'bmk/snmp/manager/deprecate_old_api/OTP-9174' into bmk/snmp/snmp420_integration
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
Diffstat (limited to 'lib/reltool')
-rw-r--r-- | lib/reltool/test/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/reltool/test/Makefile b/lib/reltool/test/Makefile index abd2e81cdf..62fe05238b 100644 --- a/lib/reltool/test/Makefile +++ b/lib/reltool/test/Makefile @@ -76,7 +76,7 @@ release_tests_spec: opt $(INSTALL_DATA) reltool.spec reltool.cover $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR) $(INSTALL_SCRIPT) rtt $(INSTALL_PROGS) $(RELSYSDIR) $(INSTALL_DATA) $(INSTALL_PROGS) $(RELSYSDIR) -# chmod -f -R u+w $(RELSYSDIR) +# chmod -R u+w $(RELSYSDIR) # @tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -) release_docs_spec: |