summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-sysadm/2011-January/001621.html
blob: 2e44d7ea3eb15407ecb54a523fa534dd11618d8a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
 <HEAD>
   <TITLE> [Mageia-sysadm] [232] merge r124 from live
   </TITLE>
   <LINK REL="Index" HREF="index.html" >
   <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B232%5D%20merge%20r124%20from%20live&In-Reply-To=%3C20110106200309.9CF7941A9F%40valstar.mageia.org%3E">
   <META NAME="robots" CONTENT="index,nofollow">
   <META http-equiv="Content-Type" content="text/html; charset=us-ascii">
   <LINK REL="Previous"  HREF="001617.html">
   <LINK REL="Next"  HREF="001622.html">
 </HEAD>
 <BODY BGCOLOR="#ffffff">
   <H1>[Mageia-sysadm] [232] merge r124 from live</H1>
    <B>root at mageia.org</B> 
    <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B232%5D%20merge%20r124%20from%20live&In-Reply-To=%3C20110106200309.9CF7941A9F%40valstar.mageia.org%3E"
       TITLE="[Mageia-sysadm] [232] merge r124 from live">root at mageia.org
       </A><BR>
    <I>Thu Jan  6 21:03:09 CET 2011</I>
    <P><UL>
        <LI>Previous message: <A HREF="001617.html">[Mageia-sysadm] Upload failed for @188:mgarepo-1.9.3-1.mga1.src.rpm
</A></li>
        <LI>Next message: <A HREF="001622.html">[Mageia-sysadm] [233] merge from trunk, rev 97
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#1621">[ date ]</a>
              <a href="thread.html#1621">[ thread ]</a>
              <a href="subject.html#1621">[ subject ]</a>
              <a href="author.html#1621">[ author ]</a>
         </LI>
       </UL>
    <HR>  
<!--beginarticle-->
<PRE>Revision: 232
Author:   misc
Date:     2011-01-06 21:03:09 +0100 (Thu, 06 Jan 2011)
Log Message:
-----------
merge r124 from live

Modified Paths:
--------------
    identity/CatDap/trunk/catdap.yml

Modified: identity/CatDap/trunk/catdap.yml
===================================================================
--- identity/CatDap/trunk/catdap.yml	2011-01-06 17:30:05 UTC (rev 231)
+++ identity/CatDap/trunk/catdap.yml	2011-01-06 20:03:09 UTC (rev 232)
@@ -78,6 +78,7 @@
                        - roomNumber
                        - secretary
                        - mailForwardingAddress
+                       - sshPublicKey
 
 # Currently not used, we only respect editable_attrs
         uneditable_attrs:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: &lt;/pipermail/mageia-sysadm/attachments/20110106/02f2ce9e/attachment-0001.html&gt;
</PRE>






















<!--endarticle-->
    <HR>
    <P><UL>
        <!--threads-->
	<LI>Previous message: <A HREF="001617.html">[Mageia-sysadm] Upload failed for @188:mgarepo-1.9.3-1.mga1.src.rpm
</A></li>
	<LI>Next message: <A HREF="001622.html">[Mageia-sysadm] [233] merge from trunk, rev 97
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#1621">[ date ]</a>
              <a href="thread.html#1621">[ thread ]</a>
              <a href="subject.html#1621">[ subject ]</a>
              <a href="author.html#1621">[ author ]</a>
         </LI>
       </UL>

<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
mailing list</a><br>
</body></html>