1. Elliot Peele
  2. conary-macho

Commits

David Christian  committed 8f4926a Merge

branch merge from 1.2

  • Participants
  • Parent commits d4977b5, e2a1a0c
  • Branches default

Comments (0)

Files changed (3)

File .hgtags

View file
 a3cb0e4f0908db2c733fb4f07bf7375ac2e12252 conary-1.1.31.10
 777a5c4bbfd22a7d813073ef99a108c83249b5ff conary-1.1.31.10
 5e5d47f0a80e7fb042c545f9b0573be5b2857f28 conary-1.1.31.11
-48d380cf147fd8dfb6ea2799409e7436d40900c3 conary-1.1.31.12
+34665b203c84138e5bfc58993f7d0045cbd0fcab conary-1.1.31.12
 16864b0a2cd9f728e8edd60c2e61271dc8bcb9be conary-1.1.31
 aad9890648fabfbf228448e5186befa01ddf6133 conary-1.1.32
 ab267b51ae3416bde1cb71b7371c1c26fe0d50ea conary-1.1.33
 ed3a544c540fd0f5237883dac066cca24de1157f conary-1.2.14
 fd2e78f0ddddd97211f258f338bd4871a6479d00 conary-1.2.15
 fa984d8aa94e1c57c63d21aafcc99577ba763ed9 conary-1.2.16
+44270fba6933be5875ec665029a40b0a0c7cd097 conary-1.2.17
 ba8a1fb75eab21ac8987ff525a4b6b7c6d9229cf conary-2.0.0
 43756bb6b33134968270c5432c79016bc9e71430 conary-2.0.1
 0cc8dd75ad3dd232d5c45ecba687fa56c8779f6c conary-2.0.2

File Makefile

View file
 forcedist: $(dist_files) smoketest
 
 tag:
-	hg tag conary-$(VERSION)
+	hg tag -f conary-$(VERSION)
 
 clean: clean-subdirs default-clean
 

File NEWS

View file
-Changes in @NEW@:
-    * When using the tagScript argument with the client's applyUpdateJob
-      call, the paths to group scripts to be executed are stored relative
-      to the root of the installation, instead of absolute. The tag
-      script is always supposed to be executed under chroot. (CNY-2523)
-
 Changes in 2.0.6:
   o Build Changes:
     * Java dependencies for classes that are not dependency-complete
     * When updating a group which contained a package that used to be
       byDefault False but is now byDefault True, Conary will now install
       the package. (CNY-2507)
+    * When using the tagScript argument with the client's applyUpdateJob
+      call, the paths to group scripts to be executed are stored relative
+      to the root of the installation, instead of absolute. The tag
+      script is always supposed to be executed under chroot. (CNY-2523)
 
   o Server Changes:
     * The serverName configuration option now allows glob-style
       wildcards.  (CNY-2293)
     * Slow SQL queries used to remove unused entries from the
       TroveFiles table and TroveTroves table have been rewritten to
-      make markremoved faster with repositories implemented with a 
+      make some queries faster with repositories implemented with a
       sqlite database. (CNY-2515)
 
   o Other changes: