From: "J. Bruce Fields" <bfields@redhat.com>
To: Fred Isaman <iisaman@netapp.com>
Cc: linux-nfs@vger.kernel.org, Mi Jinlong <mijinlong@cn.fujitsu.com>,
"J. Bruce Fields" <bfields@redhat.com>
Subject: [PATCH 5/6] Merge top-level READMEs
Date: Thu, 28 Jul 2011 16:03:03 -0400 [thread overview]
Message-ID: <1311883384-20260-6-git-send-email-bfields@redhat.com> (raw)
In-Reply-To: <1311883384-20260-1-git-send-email-bfields@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
README | 17 +++++++++++++----
README-4.1 | 8 --------
2 files changed, 13 insertions(+), 12 deletions(-)
delete mode 100644 README-4.1
diff --git a/README b/README
index 4fc8ad3..e756871 100644
--- a/README
+++ b/README
@@ -1,4 +1,13 @@
-The 4.0 and 4.1 git trees have been merged, preparing for merging of
-the actual code bases. As a first step, the original 4.0 code was
-just moved down into the nfs4.0 directory. If yuo want to ignore the
-4.1 work, just cd down to nfs4.0 and work from there as before.
+This tree includes support for both 4.0 and 4.1 pynfs testing. It is
+the merge of what were originally two independent projects--initially
+the 4.0 pynfs code was all moved into the nfs4.0 directory, but as time
+passes we expect to merge the two code bases.
+
+You can prepare both for use with a single
+ ./setup.py build_ext --inplace
+which will create auto-generated files and compile any shared libraries
+in place.
+
+For more details about 4.0 and 4.1 testing, see nfs4.0/README and
+nfs4.1/README, respectively. For information about automatic code
+generation from an XDR file, see xdr/README.
diff --git a/README-4.1 b/README-4.1
deleted file mode 100644
index fcfe9d9..0000000
--- a/README-4.1
+++ /dev/null
@@ -1,8 +0,0 @@
-For nfs4 testing, see the nfs4/README.
-For automatic code generation frmo an XDR file, see xdr/README.
-
-First, if you need gss (kerberos), cd to the gssapi directoy
-and run "python setup.py build_ext --inplace"
-
-To use, you will first need to run "python setup.py build" to generate
-python files from xdr.
--
1.7.4.1
next prev parent reply other threads:[~2011-07-28 20:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-28 20:02 [PATCH 0/6] pynfs patches J. Bruce Fields
2011-07-28 20:02 ` [PATCH 1/6] CLNT: provide new_client_session shortcut J. Bruce Fields
2011-07-28 20:03 ` [PATCH 2/6] CLNT: send RECLAIM_COMPLETE when required J. Bruce Fields
2011-07-28 20:03 ` [PATCH 3/6] Share showresults.py between 4.0 and 4.1 J. Bruce Fields
2011-07-28 20:03 ` [PATCH 4/6] Make top-level setup.py set up nfs4.0 as well J. Bruce Fields
2011-07-28 20:03 ` J. Bruce Fields [this message]
2011-07-28 20:45 ` [PATCH 5/6] Merge top-level READMEs J. Bruce Fields
2011-07-28 20:03 ` [PATCH 6/6] Share testmod.py between nfs4.0 and nfs4.1 J. Bruce Fields
2011-08-01 22:35 ` [PATCH 0/6] pynfs patches J. Bruce Fields
2011-08-09 20:30 ` two more minor " J. Bruce Fields
2011-08-17 20:54 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1311883384-20260-6-git-send-email-bfields@redhat.com \
--to=bfields@redhat.com \
--cc=iisaman@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=mijinlong@cn.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).